Feature: Frontend some fixes