Feature implement/fix css