Overal

This commit resolves #21 and resolves #4  and resolves #7 -> Alot of little styling additions