feat: code structuring fixes, added small CSS improvements;